segfault when waypoints didn't have descriptions e.g. '-i arc'

diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.c
index 04acd2ec1f7d556d520ebffd5d6d46ded70e6f31..f91b503f22231239256862fa3dddc43720ac456f 100644 (file)
--- a/gpsbabel/waypt.c
+++ b/gpsbabel/waypt.c
@@ -131,15 +131,17 @@ waypt_disp(const waypoint *wpt)
        }
        printposn(wpt->latitude,1);
        printposn(wpt->longitude,0);
-       
-       tmpdesc = str_utf8_to_ascii( wpt->description);
-       printf("%s/%s", 
-               global_opts.synthesize_shortnames ? 
+
+       if ( wpt->description ) {       
+               tmpdesc = str_utf8_to_ascii( wpt->description);
+               printf("%s/%s", 
+                       global_opts.synthesize_shortnames ? 
                        mkshort(mkshort_handle, tmpdesc) : 
                                wpt->shortname, 
                                tmpdesc);
-       if ( tmpdesc ) 
-               xfree(tmpdesc);
+               if ( tmpdesc ) 
+                       xfree(tmpdesc);
+       }
 
        if (wpt->altitude != unknown_alt)
                printf(" %f", wpt->altitude);